This is a groady submit. This is where I take all of the things that were

tacky or sleazy related to character encoding and basically apply pain killer
to them.  Most of the tests were clearly made up and were just
institutionalizing what we did instead of thinking about what was right.
Remove the '-c' flag.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4670 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/main.cc b/gpsbabel/main.cc
index 406fbc72a0b5428fa6f01b4cf287523ac3bfff88..7453a4dcd63b9f0f3d0b59d71589dfd05f863954 100644 (file)
--- a/gpsbabel/main.cc
+++ b/gpsbabel/main.cc
@@ -320,10 +320,10 @@ main(int argc, char* argv[])
     }
 
     switch (c) {
-    case 'c':
-      optarg = argv[argn][2] ? argv[argn]+2 : argv[++argn];
-      cet_convert_init(optarg, 1);
-      break;
+    //case 'c':
+    //  optarg = argv[argn][2] ? argv[argn]+2 : argv[++argn];
+    //  cet_convert_init(optarg, 1);
+    //  break;
     case 'i':
       optarg = argv[argn][2]
                ? argv[argn]+2 : argv[++argn];

diff --git a/gpsbabel/reference/gc/GC7FA4~unicsv.csv b/gpsbabel/reference/gc/GC7FA4~unicsv.csv
index 06cfeef86b0987a8155b0d531290c15097969ce9..dc5084edc4c9cbd69c64edb4a5a05db2475c081c 100644 (file)
--- a/gpsbabel/reference/gc/GC7FA4~unicsv.csv
+++ b/gpsbabel/reference/gc/GC7FA4~unicsv.csv
@@ -1,2 +1,2 @@
 No,Latitude,Longitude,Name,Description,Symbol,Date,Time,URL,GCID,Type,Container,Terrain,Difficulty,Archived,Available,Last Found,Placer,Placer ID\r
-1,46.133333,-73.000000,"GC7FA4","Points geodesiques du Quebec","Geocache",2002/08/15,07:00:00,"http://www.geocaching.com/seek/cache_details.aspx?guid=727f9d2c-f080-41f1-a2c9-a326ead462ed",32676,"Locationless (Reverse) Cache","Virtual",1.0,1.0,"False","True","2005/07/12 07:00:00","Sverdrup2",6293\r
+1,46.133333,-73.000000,"GC7FA4","Points géodésiques du Québec","Geocache",2002/08/15,07:00:00,"http://www.geocaching.com/seek/cache_details.aspx?guid=727f9d2c-f080-41f1-a2c9-a326ead462ed",32676,"Locationless (Reverse) Cache","Virtual",1.0,1.0,"False","True","2005/07/12 07:00:00","Sverdrup2",6293\r

diff --git a/gpsbabel/reference/gc/maggeo.gs b/gpsbabel/reference/gc/maggeo.gs
index 4ca564939ced1c0eb71245182ee4cef873978f68..6bf5b8f574ee62eb665ba01af1fcb203d3d99121 100644 (file)
--- a/gpsbabel/reference/gc/maggeo.gs
+++ b/gpsbabel/reference/gc/maggeo.gs
@@ -1,3 +1,3 @@
-$PMGNGEO,4608.000,N,7300.000,W,0000,F,GC7FA4,Points geodesiques d,Sverdrup2,,Locationless (Reverse) Cache,1508102,1207105,1.0,1.0*3E\r
+$PMGNGEO,4608.000,N,7300.000,W,0000,F,GC7FA4,Points godsiques,Sverdrup2,,Locationless (Reverse) Cache,1508102,1207105,1.0,1.0*7A\r
 $PMGNGEO,3555.300,N,8651.700,W,0000,F,GCGCA8,Oozy rat in a sanita,robertlipe,,Mystery Cache,2906103,0307105,3.0,2.0*4A\r
 $PMGNCMD,END*3D\r

diff --git a/gpsbabel/testo.d/cet.test b/gpsbabel/testo.d/cet.test
deleted file mode 100644 (file)
index f935306..0000000
--- a/gpsbabel/testo.d/cet.test
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# cet - Character encoding transformation tests
-#
-rm -f ${TMPDIR}/cet-sample*
-gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o gpx -F ${TMPDIR}/cet-sample.gpx
-compare ${REFERENCE}/cet/cet-sample.gpx ${TMPDIR}/cet-sample.gpx
-gpsbabel -w -i gpx -f ${TMPDIR}/cet-sample.gpx -o tmpro -c Latin1 -F ${TMPDIR}/cet-sample.latin1.txt
-compare ${REFERENCE}/cet/cet-sample.latin1.txt ${TMPDIR}/cet-sample.latin1.txt
-gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o tmpro -c Latin2 -F ${TMPDIR}/cet-sample.latin2.txt
-compare ${REFERENCE}/cet/cet-sample.latin2.txt ${TMPDIR}/cet-sample.latin2.txt
-gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o tmpro -c cp1250 -F ${TMPDIR}/cet-sample.cp1250.txt
-compare ${REFERENCE}/cet/cet-sample.cp1250.txt ${TMPDIR}/cet-sample.cp1250.txt
-gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o tmpro -c macroman -F ${TMPDIR}/cet-sample.macroman.txt
-compare ${REFERENCE}/cet/cet-sample.macroman.txt ${TMPDIR}/cet-sample.macroman.txt
-

diff --git a/gpsbabel/testo.d/classic-2.test b/gpsbabel/testo.d/classic-2.test
index 207da68ee55e625cb4f2c5c78dda3e04047a8703..2102c3cfafd882749e5158c2d4611d0eabd31b3b 100644 (file)
--- a/gpsbabel/testo.d/classic-2.test
+++ b/gpsbabel/testo.d/classic-2.test
@@ -7,9 +7,6 @@ rm -f ${TMPDIR}/humanread.out
 gpsbabel -i xcsv,style=${REFERENCE}/humanread.style -f ${REFERENCE}/human.in -o arc -F ${TMPDIR}/humanread.out
 compare ${REFERENCE}/humanread.out ${TMPDIR}/humanread.out
 
-rm -f ${TMPDIR}/humanwrite.out
-gpsbabel -i xcsv,style=${REFERENCE}/humanread.style -f ${REFERENCE}/human.in -o xcsv,style=${REFERENCE}/humanwrite.style -F ${TMPDIR}/humanwrite.out
-compare ${REFERENCE}/humanwrite.out ${TMPDIR}/humanwrite.out
 
 #
 # XCSV "path distance" test

diff --git a/gpsbabel/testo.d/deprecated/cet.test b/gpsbabel/testo.d/deprecated/cet.test
new file mode 100644 (file)
index 0000000..f935306
--- /dev/null
+++ b/gpsbabel/testo.d/deprecated/cet.test
@@ -0,0 +1,15 @@
+#
+# cet - Character encoding transformation tests
+#
+rm -f ${TMPDIR}/cet-sample*
+gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o gpx -F ${TMPDIR}/cet-sample.gpx
+compare ${REFERENCE}/cet/cet-sample.gpx ${TMPDIR}/cet-sample.gpx
+gpsbabel -w -i gpx -f ${TMPDIR}/cet-sample.gpx -o tmpro -c Latin1 -F ${TMPDIR}/cet-sample.latin1.txt
+compare ${REFERENCE}/cet/cet-sample.latin1.txt ${TMPDIR}/cet-sample.latin1.txt
+gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o tmpro -c Latin2 -F ${TMPDIR}/cet-sample.latin2.txt
+compare ${REFERENCE}/cet/cet-sample.latin2.txt ${TMPDIR}/cet-sample.latin2.txt
+gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o tmpro -c cp1250 -F ${TMPDIR}/cet-sample.cp1250.txt
+compare ${REFERENCE}/cet/cet-sample.cp1250.txt ${TMPDIR}/cet-sample.cp1250.txt
+gpsbabel -w -i gdb -f ${REFERENCE}/cet/cet-sample.gdb -o tmpro -c macroman -F ${TMPDIR}/cet-sample.macroman.txt
+compare ${REFERENCE}/cet/cet-sample.macroman.txt ${TMPDIR}/cet-sample.macroman.txt
+

diff --git a/gpsbabel/testo.d/deprecated/humanwrite.test b/gpsbabel/testo.d/deprecated/humanwrite.test
new file mode 100644 (file)
index 0000000..47b4d44
--- /dev/null
+++ b/gpsbabel/testo.d/deprecated/humanwrite.test
@@ -0,0 +1,6 @@
+#
+# XCSV "human writeable" tests
+#
+rm -f ${TMPDIR}/humanwrite.out
+gpsbabel -i xcsv,style=${REFERENCE}/humanread.style -f ${REFERENCE}/human.in -o xcsv,style=${REFERENCE}/humanwrite.style -F ${TMPDIR}/humanwrite.out
+compare ${REFERENCE}/humanwrite.out ${TMPDIR}/humanwrite.out